Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(x/slashing): add autocli options for tx (backport #17967) #18017

Merged
merged 3 commits into from
Oct 9, 2023
Merged

feat(x/slashing): add autocli options for tx (backport #17967) #18017

merged 3 commits into from
Oct 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2023

This is an automatic backport of pull request #17967 done by Mergify.
Cherry-pick of 3690d9f has failed:

On branch mergify/bp/release/v0.50.x/pr-17967
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 3690d9f7f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   client/v2/autocli/flag/builder.go
	modified:   x/slashing/autocli.go
	deleted:    x/slashing/client/cli/flags.go
	deleted:    x/slashing/client/cli/tx.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/v2/autocli/msg.go
	deleted by them: x/slashing/client/cli/tx_test.go
	both modified:   x/slashing/module.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@julienrbrt @mergify
feat(x/slashing): add autocli options for tx (#17967)
dfc4432 
(cherry picked from commit 3690d9f)

# Conflicts:
#	client/v2/autocli/msg.go
#	x/slashing/client/cli/tx_test.go
#	x/slashing/module.go
@mergify mergify bot requested a review from a team as a code owner October 9, 2023 14:01
@mergify mergify bot added the conflicts label Oct 9, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

@mergify[bot] your pull request is missing a changelog!

@julienrbrt julienrbrt self-assigned this Oct 9, 2023
@julienrbrt julienrbrt removed their assignment Oct 9, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) October 9, 2023 14:25
@julienrbrt julienrbrt merged commit 0f419f3 into release/v0.50.x Oct 9, 2023
44 of 46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17967 branch October 9, 2023 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@facundomedica facundomedica Awaiting requested review from facundomedica

@atheeshp atheeshp Awaiting requested review from atheeshp

Assignees
No one assigned
Labels
C:CLI C:x/slashing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@julienrbrt